Shaders using GLSL not Cg/HLSL by revmischa · Pull Request #26 · projectM-visualizer/projectm

revmischa · 2018-02-02T19:20:25Z

Trying to get rid of super ancient unsupported nVidia Cg framework and use standard GL shaders.
The shaders in preset files are written in HLSL for DirectX. projectM used a toolkit from nVidia called Cg to handle them, but Cg is long deprecated and obsolete.
I'm attempting to use https://github.com/Thekla/hlslparser to transpile from HLSL to GLSL on the fly, and it's close to working but has some syntax issues.

The main conversion is done in:
https://github.com/projectM-visualizer/projectm/pull/26/files#diff-6df95f02d59c83baf42ed81c8668722a
https://github.com/projectM-visualizer/projectm/pull/26/files#diff-f4b5c1904e3d8fa6c1248fe1ac843d79

This may be close to working but it has issues right now. Needs work.

axe312ger · 2018-02-27T09:04:35Z

Awesome! Will this boost the visual quality, too? Or is it just refactoring to get rid of legacy code?

revmischa · 2018-02-27T09:05:50Z

If we can get the shaders to work it will greatly increase the quality. However the shaders are written in DirectX/Cg style and may need some converting to GLSL style. I dunno anything about doing that so someone else needs to help.

axe312ger · 2018-02-27T10:18:46Z

Maybe twitter can help? I tweeted about it here: https://twitter.com/axe312ger/status/968429518095634432

revmischa · 2018-02-27T10:35:27Z

I'll put up a status update on where things are at in the next few weeks.. stay tuned

revmischa · 2018-02-27T10:37:51Z

I'm not working on anything right now for projectM (busy with $dayjob), but I'm happy to provide guidance to anyone who wants to contribute

axe312ger · 2018-02-28T09:15:12Z

Any chance this can help?
https://www.opengl.org/discussion_boards/showthread.php/174728-Compiling-CG-to-GLSL

cgc -profile glslv vert.cg

revmischa · 2018-02-28T09:17:23Z

Very cool! Feel free to give it a try. The shader code is shoved inside the preset files in a funky format though so you'd have to parse it out, convert it, and reinsert it

Merge master + work on HLSL->GLSL transpilation

revmischa · 2018-05-27T19:19:17Z

I'm giving https://github.com/Thekla/hlslparser a try - it should transpile from HLSL to GLSL. I've got it hooked up, now work needs to be done on passing in the variables and texture samplers from projectM into the shaders. Then maybe shaders will work!

revmischa · 2018-05-28T06:59:39Z

Some syntax issues and GL versioning issues but it's close! I think!

- miising keywords - rsqrt function - modulo support - preprocessor if/else/endif support - several small fixes

deltaoscarmike · 2018-08-22T20:16:11Z

Status:

All presets with a warp and/or composite shader are successfully compiled in GLSL
Nativepresets are working again
screens "borders" are fixed

To do: fix rendering differences against winamp/milkdrop. Some presets are correctly rendered but other have visual issues.

revmischa · 2018-08-22T20:26:24Z

src/libprojectM/Renderer/TextureManager.cpp

-    loadTextureDir();
+
+    loadTextureDir(std::string(DATADIR_PATH) + "/presets");
+    loadTextureDir(std::string(DATADIR_PATH) + "/textures");


does this exist?

revmischa · 2018-08-22T20:32:53Z

Bravo! Good stuff 👍
You think you're gonna submit the hlslparser fixes back?

revmischa · 2018-08-22T20:48:00Z

Got a crash:

libc++abi.dylib: Pure virtual function called!
Process 76589 stopped
* thread #1, queue = 'com.apple.main-thread', stop reason = signal SIGABRT
    frame #0: 0x00007fff5ba5bb66 libsystem_kernel.dylib`__pthread_kill + 10
libsystem_kernel.dylib`__pthread_kill:
->  0x7fff5ba5bb66 <+10>: jae    0x7fff5ba5bb70            ; <+20>
    0x7fff5ba5bb68 <+12>: movq   %rax, %rdi
    0x7fff5ba5bb6b <+15>: jmp    0x7fff5ba52ae9            ; cerror_nocancel
    0x7fff5ba5bb70 <+20>: retq   
Target 0: (projectMSDL) stopped.

revmischa · 2018-08-22T21:32:16Z

doesn't crash if i disable threading

deltaoscarmike · 2018-08-23T10:41:17Z

You think you're gonna submit the hlslparser fixes back?

No, my modifications have many impacts on Metal and HLSL generators and it's a lot of work to make sure these will still generate valid code.

Got a crash:

Could you provide a more explicit backtrace callstack (with files and line number) ?

Add comments for test flags

revmischa · 2018-09-02T20:37:19Z

Anything left to do @deltaoscarmike? Is it good to go? Can I help with anything?

revmischa · 2018-09-07T19:51:47Z

@deltaoscarmike merge y/n?

deltaoscarmike · 2018-09-08T07:28:27Z

Yes

@deltaoscarmike

Re-enable shaders on modern platforms by transpiling HLSL to GLSL on the fly. Better GLES support. Running successfully on embedded systems with GLES and shaders. Compiles and almost runs with emscripten now (#92). Mega props 👏 => @deltaoscarmike <= 👏

revmischa added 4 commits October 1, 2017 12:10

ditching Cg, sort of hooking up GL shaders

0732b62

Merge branch 'master' into glsl

d7a3960

run in fullscreen

f6e12f7

renderer xcode project

f6d1caf

revmischa self-assigned this Feb 2, 2018

merge master

4937b94

revmischa mentioned this pull request Apr 8, 2018

Optimization Projects #51

Closed

Merge branch 'master' into glsl

78058b9

Merge master + work on HLSL->GLSL transpilation

revmischa added 5 commits May 27, 2018 22:21

files I did not mean to commit

43455b8

remove this

49335d3

files I did not mean to commit

140d133

files I did not mean to commit

f094898

not quite working HLSL->GLSL translation... has some issues

c41007b

revmischa changed the title ~~Shaders using GLSL not Cg~~ Shaders using GLSL not Cg/HLSL May 28, 2018

revmischa mentioned this pull request Jun 1, 2018

Accessing per_pixel variable from per_point expression #64

Closed

revmischa added 6 commits June 2, 2018 14:54

WIP

d2cc75b

start of GL3/GLES modernization

c30c6f6

(basic) shaders compiling

3c1306e

cleanup

37af98c

lot more modernization work I have no idea if it's correct lol

02e29f5

WIP I don't know what I'm doing lol help

453b9e9

deltaoscarmike added 6 commits August 21, 2018 20:01

Fixing HLSLTranslator:

6157c58

- miising keywords - rsqrt function - modulo support - preprocessor if/else/endif support - several small fixes

Several HLSLTranslator fixes

85bb5f9

Complete HLSLTranslator matrix support

7d2e16b

Fix texture management

c0ff137

Small fixes

e6f1464

Fix native presets

92ce639

revmischa commented Aug 22, 2018

View reviewed changes

revmischa added 2 commits August 22, 2018 22:34

Merge branch 'glsl' of github.com:projectM-visualizer/projectm into glsl

93059b1

fixing itunes stuff a little

00e93e6

deltaoscarmike and others added 3 commits August 23, 2018 20:18

Merge branch 'master' into glsl

4b02c8d

Fix unlock FPS flag

8785481

Add comments for test flags

Merge branch 'glsl' of github.com:projectM-visualizer/projectm into glsl

46f4bc3

This was referenced Sep 2, 2018

windows binary release #98

Closed

iTunes Plugin Not Compatible with OS X 10.12.4 #7

Closed

revmischa added 2 commits September 3, 2018 00:06

How2build

bbc88de

removing incredibly outdated FAQ

aed5350

revmischa mentioned this pull request Sep 3, 2018

Antergos Projectm for pulseaudio crashing at preset change. #100

Closed

revmischa merged commit 6240b9d into master Sep 8, 2018

mbellew mentioned this pull request Jan 11, 2019

projectM::renderFrame() synchronization #147

Closed

TranarchySec mentioned this pull request Oct 3, 2019

Crash on start free(): double free detected in tcache 2 #241

Closed

revmischa mentioned this pull request Apr 13, 2020

Clarify required OpenGL profile #336

Closed

Uh oh!

Conversation

revmischa commented Feb 2, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

axe312ger commented Feb 27, 2018

Uh oh!

revmischa commented Feb 27, 2018

Uh oh!

axe312ger commented Feb 27, 2018

Uh oh!

revmischa commented Feb 27, 2018

Uh oh!

revmischa commented Feb 27, 2018

Uh oh!

axe312ger commented Feb 28, 2018

Uh oh!

revmischa commented Feb 28, 2018

Uh oh!

revmischa commented May 27, 2018

Uh oh!

revmischa commented May 28, 2018

Uh oh!

deltaoscarmike commented Aug 22, 2018

Uh oh!

revmischa Aug 22, 2018

Choose a reason for hiding this comment

Uh oh!

revmischa commented Aug 22, 2018

Uh oh!

revmischa commented Aug 22, 2018

Uh oh!

revmischa commented Aug 22, 2018

Uh oh!

deltaoscarmike commented Aug 23, 2018

Uh oh!

revmischa commented Sep 2, 2018

Uh oh!

revmischa commented Sep 7, 2018

Uh oh!

deltaoscarmike commented Sep 8, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

revmischa commented Feb 2, 2018 •

edited

Loading